Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Fixes #109258.

If the item isn't inlined, it shouldn't have been added into view_item_stack. The problem here was that it was not removed, preventing sub items to be inlined if they have a re-export in "upper levels".

cc @epage
r? @notriddle

@GuillaumeGomez GuillaumeGomez changed the title Fix missing private inlining rustdoc: Fix missing private inlining Mar 17, 2023
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 17, 2023
@GuillaumeGomez GuillaumeGomez force-pushed the fix-missing-private-inlining branch from 84c1a61 to e9f29c4 Compare March 17, 2023 16:04
@GuillaumeGomez
Copy link
Member Author

@notriddle Good catch. I was able to reproduce the bug with inline module. Updated the test.

@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 17, 2023

📌 Commit e9f29c4 has been approved by notriddle

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 17, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
…-inlining, r=notriddle

rustdoc: Fix missing private inlining

Fixes rust-lang#109258.

If the item isn't inlined, it shouldn't have been added into `view_item_stack`. The problem here was that it was not removed, preventing sub items to be inlined if they have a re-export in "upper levels".

cc `@epage`
r? `@notriddle`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
…-inlining, r=notriddle

rustdoc: Fix missing private inlining

Fixes rust-lang#109258.

If the item isn't inlined, it shouldn't have been added into `view_item_stack`. The problem here was that it was not removed, preventing sub items to be inlined if they have a re-export in "upper levels".

cc ``@epage``
r? ``@notriddle``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
…-inlining, r=notriddle

rustdoc: Fix missing private inlining

Fixes rust-lang#109258.

If the item isn't inlined, it shouldn't have been added into `view_item_stack`. The problem here was that it was not removed, preventing sub items to be inlined if they have a re-export in "upper levels".

cc ```@epage```
r? ```@notriddle```
@matthiaskrgr
Copy link
Member

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 17, 2023
@GuillaumeGomez
Copy link
Member Author

It's the only rustdoc PR in the rollup but I can't reproduce the CI failure locally and I don't really see why this test in particular would now fail. Quite surprising... Maybe it's a mix with another PR in the rollup that gave this result?

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Mar 19, 2023

I really can't figure out from my tests how it could make this error. Let's retry then.

@bors r=notriddle

@bors
Copy link
Collaborator

bors commented Mar 19, 2023

📌 Commit e9f29c4 has been approved by notriddle

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 19, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2023
…iaskrgr

Rollup of 13 pull requests

Successful merges:

 - rust-lang#109249 (Update names/comments for new return-position impl trait in trait lowering strategy)
 - rust-lang#109259 (rustdoc: Fix missing private inlining)
 - rust-lang#109269 (rustdoc: cleanup some intermediate allocs)
 - rust-lang#109301 (fix: fix ICE in `custom-test-frameworks` feature)
 - rust-lang#109319 (Add test for `c_variadic` in rustdoc-json)
 - rust-lang#109323 (Ignore files in .gitignore in mir opt check)
 - rust-lang#109331 (rustdoc: implement bag semantics for function parameter search)
 - rust-lang#109337 (Improve `Iterator::collect_into` documentation)
 - rust-lang#109351 (rustdoc: Remove footnote references from doc summary)
 - rust-lang#109353 (Fix wrong crate name in custom MIR docs)
 - rust-lang#109362 (Split `items` from `-Zmeta-stats` in two.)
 - rust-lang#109370 (fix ClashingExternDeclarations lint ICE)
 - rust-lang#109375 (rustdoc: Fix improper escaping of deprecation reasons)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c076799 into rust-lang:master Mar 20, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 20, 2023
@GuillaumeGomez GuillaumeGomez deleted the fix-missing-private-inlining branch March 20, 2023 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing inlining for private re-export
5 participants